0a45a53aea58309cf3e703a0e17c382a846805f5,shop/billing/internal/src/main/java/org/mayocat/shop/billing/internal/SendEmailsWhenOrderIsPaid.java,SendEmailsWhenOrderIsPaid,sendNotificationMails,#Order#Tenant#Locale#Locale#,141

Before Change


                billingAddress = Optional.absent();
            }
            Optional<Address> deliveryAddress;
            if (order.getDeliveryAddress().isLoaded()) {
                deliveryAddress = Optional.of(order.getDeliveryAddress().get());
            } else {
                deliveryAddress = Optional.absent();
            }

After Change


                billingAddress = Optional.absent();
            }
            Optional<Address> deliveryAddress;
            if (order.getDeliveryAddress() != null) {
                deliveryAddress = Optional.of(order.getDeliveryAddress());
            } else {
                deliveryAddress = Optional.absent();
            }